Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve Upper Bound issues, update Groovy #133

Merged
merged 3 commits into from
Oct 20, 2017
Merged

Resolve Upper Bound issues, update Groovy #133

merged 3 commits into from
Oct 20, 2017

Conversation

oleg-nenashev
Copy link
Member

  • - Update parent POM
  • - Add upper bound enforcement
  • - cleanup issues (mostly commons-*)
  • - Update Groovy to 2.4.11, so it is the same as the core baseline

All versions are compatible with the Jenkins core.

@reviewbybees @jglick

@ghost
Copy link

ghost commented Oct 10, 2017

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

@jglick jglick self-requested a review October 10, 2017 17:50
oleg-nenashev
oleg-nenashev commented Oct 10, 2017
View reviewed changes
pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.kohsuke</groupId>
<artifactId>pom</artifactId>
<version>14</version>
<version>19</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we should start migrating it to https://github.com/jenkinsci/pom.
IIUC there is no other things excepting Plugin site release and code signing there. WDYT @jglick ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure. Technically this is a non-Jenkins component.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's something we could also fix. Stapler is a critical part of Jenkins && it's not extremely popular elsewhere, so moving it && integrating common Jenkins QA/review flow would not hurt. It's something we were discussing multiple times, but maybe it belongs to the ML now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically that would mean not releasing it to Central any more. Fine with me, but needs some discussion.

jglick
jglick approved these changes Oct 10, 2017
View reviewed changes
Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds OK.

core/pom.xml
@@ -44,12 +44,22 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
<version>1.8.0</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these aligned with jenkins-core?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jenkins core is at 1.8.3. Can bump it even more

@jglick
Copy link
Member

jglick commented Oct 10, 2017

Oops:

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-site-plugin:3.3:site (default-site) on project stapler-parent: failed to get report for org.apache.maven.plugins:maven-javadoc-plugin: Failed to execute goal org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M1:enforce (default) on project stapler: Execution default of goal org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M1:enforce failed. NullPointerException -> [Help 1]

@oleg-nenashev
Copy link
Member Author

Works on my machine (c). No sure what happens there

@jglick
Copy link
Member

jglick commented Oct 11, 2017

Reproducible locally:

java.lang.NullPointerException
	at org.apache.maven.plugins.enforcer.EnforceBytecodeVersion.isBadArtifact(EnforceBytecodeVersion.java:195)
	at org.apache.maven.plugins.enforcer.EnforceBytecodeVersion.checkDependencies(EnforceBytecodeVersion.java:182)
	at org.apache.maven.plugins.enforcer.EnforceBytecodeVersion.handleArtifacts(EnforceBytecodeVersion.java:109)
	at org.apache.maven.plugins.enforcer.AbstractResolveDependencies.execute(AbstractResolveDependencies.java:77)
	at org.apache.maven.plugins.enforcer.EnforceMojo.execute(EnforceMojo.java:202)

You just need to update extra-enforcer-rules to 1.0-beta-4 or later to pick up the fix of mojohaus/extra-enforcer-rules#13.

jglick
jglick requested changes Oct 12, 2017
View reviewed changes
Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As mentioned.

@oleg-nenashev
Copy link
Member Author

@jglick ptal

@jglick jglick self-requested a review October 16, 2017 15:50
jglick
jglick reviewed Oct 16, 2017
View reviewed changes
Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you track down the cause of

java.lang.NullPointerException
	at org.kohsuke.stapler.DataBindingTest.testScalarToArray(DataBindingTest.java:142)

? Unclear if this could be a regression.

jglick
jglick requested changes Oct 20, 2017
View reviewed changes
Copy link
Member

@jglick jglick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unclear if this could be a regression.

It is—reproducible, caused by the commons-beanutils upgrade. Since core has been overriding this version with 1.8.3 for years, presumably this databinding scenario does not work in real life either.

I am going to study this a bit.

pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.kohsuke</groupId>
<artifactId>pom</artifactId>
<version>14</version>
<version>19</version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Basically that would mean not releasing it to Central any more. Fine with me, but needs some discussion.

@jglick
Copy link
Member

jglick commented Oct 20, 2017

It seems NumberConverter regressed sometime between 1.7.0 and 1.8.0. 1.8.3 is also affected. But 1.9.3 is even worse—it does not convert String[]s properly either. Any I think I have identified a bug in how Stapler was calling BeanUtils that is responsible. Will file a follow-up PR.

@jglick jglick mentioned this pull request Oct 20, 2017
Merged
@jglick jglick merged commit 8d574a5 into jenkinsci:master Oct 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jglick jglick jglick requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@oleg-nenashev @jglick